127. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:50 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

127.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/importdemo16_old.xml2019-12-13 09:07:16 +0000
22021-05-13 09:08:50 +0000

127.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1787

127.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

127.4 Active regular expressions

No regular expressions were active.

127.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_16_old    
10     </cms_home_page>    
11                     
12     <cms_no_route>    
13      no-route-2    
14     </cms_no_route>    
15                 
16    </default>    
17            
18   </web>    
19           
20   <cms>    
21                
22    <wysiwyg>    
23                     
24     <enabled>    
25      hidden    
26     </enabled>    
27                 
28    </wysiwyg>    
29            
30   </cms>    
31   »           
32   <design>    
33    »       »           
34    <header>    
35     »       »       »           
36     <logo_width>    
37      162    
38     </logo_width>    
39     »       »       »           
40     <logo_height>    
41      67    
42     </logo_height>    
43     »       »       »           
44     <logo_src>    
45      default/logo_white_large.png    
46     </logo_src>    
47     »       »           
48    </header>    
49    »           
50   </design>    
51   »           
52   <dev>    
53    »       »           
54    <js>    
55     »       »       »           
56     <merge_files>    
57      1    
58     </merge_files>    
59     »       »           
60    </js>    
61    »           
62   </dev>    
63           
64   <porto_settings>    
65                
66    <general>    
67                     
68     <boxed>    
69      wide    
70     </boxed>    
71                     
72     <layout>    
73      full_width    
74     </layout>    
75                     
76     <disable_border_radius>    
77      0    
78     </disable_border_radius>    
79                     
80     <show_site_notice>    
81      0    
82     </show_site_notice>    
83                 
84    </general>    
85                
86    <header>    
87                     
88     <header_type>    
89      10    
90     </header_type>    
91                     
92     <new_skin>    
93      0    
94     </new_skin>    
95                     
96     <static_block>    
97      porto_custom_block_for_header_type_10    
98     </static_block>    
99                     
100     <currency_short>    
101      1    
102     </currency_short>    
103                     
104     <sticky_header_logo>    
105     </sticky_header_logo>    
106                 
107    </header>    
108                
109    <footer>    
110                     
111     <footer_top>    
112      0    
113     </footer_top>    
114                     
115     <footer_top_block>    
116      custom    
117     </footer_top_block>    
118                     
119     <footer_middle>    
120      1    
121     </footer_middle>    
122                     
123     <footer_ribbon>    
124      0    
125     </footer_ribbon>    
126                     
127     <footer_ribbon_text>    
128      Ribbon Text    
129     </footer_ribbon_text>    
130                     
131     <footer_middle_column_1>    
132      custom    
133     </footer_middle_column_1>    
134                     
135     <footer_middle_column_1_custom>    
136      porto_footer_links    
137     </footer_middle_column_1_custom>    
138                     
139     <footer_middle_column_1_size>    
140      3    
141     </footer_middle_column_1_size>    
142                     
143     <footer_middle_column_2>    
144      custom    
145     </footer_middle_column_2>    
146                     
147     <footer_middle_column_2_custom>    
148      porto_footer_contact_information    
149     </footer_middle_column_2_custom>    
150                     
151     <footer_middle_column_2_size>    
152      3    
153     </footer_middle_column_2_size>    
154                     
155     <footer_middle_column_3>    
156      custom    
157     </footer_middle_column_3>    
158                     
159     <footer_middle_column_3_custom>    
160      porto_footer_features    
161     </footer_middle_column_3_custom>    
162                     
163     <footer_middle_column_3_size>    
164      3    
165     </footer_middle_column_3_size>    
166                     
167     <footer_middle_column_4>    
168      newsletter    
169     </footer_middle_column_4>    
170                     
171     <footer_middle_column_4_custom>    
172      porto_footer_links    
173     </footer_middle_column_4_custom>    
174                     
175     <footer_middle_column_4_size>    
176      3    
177     </footer_middle_column_4_size>    
178                     
179     <footer_middle_2>    
180      0    
181     </footer_middle_2>    
182                     
183     <footer_middle_2_column_1>    
184      custom    
185     </footer_middle_2_column_1>    
186                     
187     <footer_middle_2_column_1_custom>    
188      porto_footer_links    
189     </footer_middle_2_column_1_custom>    
190                     
191     <footer_middle_2_column_1_size>    
192      3    
193     </footer_middle_2_column_1_size>    
194                     
195     <footer_middle_2_column_2>    
196      custom    
197     </footer_middle_2_column_2>    
198                     
199     <footer_middle_2_column_2_custom>    
200      porto_footer_links    
201     </footer_middle_2_column_2_custom>    
202                     
203     <footer_middle_2_column_2_size>    
204      3    
205     </footer_middle_2_column_2_size>    
206                     
207     <footer_middle_2_column_3>    
208      custom    
209     </footer_middle_2_column_3>    
210                     
211     <footer_middle_2_column_3_custom>    
212      porto_footer_links    
213     </footer_middle_2_column_3_custom>    
214                     
215     <footer_middle_2_column_3_size>    
216      3    
217     </footer_middle_2_column_3_size>    
218                     
219     <footer_middle_2_column_4>    
220      custom    
221     </footer_middle_2_column_4>    
222                     
223     <footer_middle_2_column_4_custom>    
224      porto_footer_links    
225     </footer_middle_2_column_4_custom>    
226                     
227     <footer_middle_2_column_4_size>    
228      3    
229     </footer_middle_2_column_4_size>    
230                     
231     <footer_bottom>    
232      1    
233     </footer_bottom>    
234                     
235     <footer_store_switcher>    
236      0    
237     </footer_store_switcher>    
238                     
239     <footer_logo_src>    
240      default/logo_footer_black.png    
241     </footer_logo_src>    
242                     
243     <footer_bottom_copyrights>    
244      <![CDATA[&copy;Copyright 2020 by PORTO. All Rights Reserved.]]>    
245     </footer_bottom_copyrights>    
246                     
247     <footer_bottom_custom_1>    
248      porto_footer_bottom_custom_block    
249     </footer_bottom_custom_1>    
250                     
251     <footer_bottom_custom_2>    
252     </footer_bottom_custom_2>    
253                 
254    </footer>    
255                
256    <category>    
257                     
258     <alternative_image>    
259      1    
260     </alternative_image>    
261                     
262     <aspect_ratio>    
263      0    
264     </aspect_ratio>    
265                     
266     <ratio_width>    
267      300    
268     </ratio_width>    
269                     
270     <ratio_height>    
271      400    
272     </ratio_height>    
273                     
274     <rating_star>    
275      1    
276     </rating_star>    
277                     
278     <product_price>    
279      1    
280     </product_price>    
281                     
282     <actions>    
283      1    
284     </actions>    
285                     
286     <addtocompare>    
287      1    
288     </addtocompare>    
289                     
290     <addtowishlist>    
291      1    
292     </addtowishlist>    
293                     
294     <page_layout>    
295      1column    
296     </page_layout>    
297                     
298     <category_description>    
299      main_column    
300     </category_description>    
301                     
302     <side_custom_block>    
303      porto_category_side_custom_block    
304     </side_custom_block>    
305                 
306    </category>    
307                
308    <category_grid>    
309                     
310     <product_type>    
311      3    
312     </product_type>    
313                     
314     <columns>    
315      6    
316     </columns>    
317                 
318    </category_grid>    
319                
320    <product>    
321                     
322     <product_image_size>    
323      6    
324     </product_image_size>    
325                     
326     <side_custom_block>    
327      porto_product_side_custom_block    
328     </side_custom_block>    
329                     
330     <main_custom_block>    
331     </main_custom_block>    
332                     
333     <main_custom_block2>    
334     </main_custom_block2>    
335                     
336     <move_addtolinks>    
337      0    
338     </move_addtolinks>    
339                     
340     <move_upsell_full>    
341      0    
342     </move_upsell_full>    
343                     
344     <page_layout>    
345      2columns-right    
346     </page_layout>    
347                     
348     <tab_full_background>    
349      0    
350     </tab_full_background>    
351                     
352     <custom_block_next_tab>    
353     </custom_block_next_tab>    
354                     
355     <upsell_columns>    
356      4    
357     </upsell_columns>    
358                     
359     <move_upsell>    
360      0    
361     </move_upsell>    
362                 
363    </product>    
364    »       »           
365    <newsletter>    
366     »       »       »           
367     <logo_src>    
368      default/logo_black.png    
369     </logo_src>    
370     »       »           
371    </newsletter>    
372                
373    <contacts>    
374                     
375     <enable>    
376      1    
377     </enable>    
378                     
379     <full_width>    
380      0    
381     </full_width>    
382                     
383     <address>    
384      Porto2 Store    
385     </address>    
386                     
387     <latitude>    
388      -34.398    
389     </latitude>    
390                     
391     <longitude>    
392      150.884    
393     </longitude>    
394                     
395     <zoom>    
396      18    
397     </zoom>    
398                     
399     <infoblock>    
400      <![CDATA[<div class="row">    
401      <div class="col-md-12">    
402          <i class="porto-icon-phone"></i>    
403          <p>0201 203 2032</p>    
404          <p>0201 203 2032</p>    
405      </div>    
406      </div>    
407      <div class="row">    
408      <div class="col-md-12">    
409          <i class="porto-icon-mobile"></i>    
410          <p>201-123-3922</p>    
411          <p>302-123-3928</p>    
412      </div>    
413      </div>    
414      <div class="row">    
415      <div class="col-md-12">    
416          <i class="porto-icon-mail-alt"></i>    
417          <p>porto@gmail.com</p>    
418          <p>porto@portotemplate.com</p>    
419      </div>    
420      </div>    
421      <div class="row">    
422      <div class="col-md-12">    
423          <i class="porto-icon-skype"></i>    
424          <p>porto_skype</p>    
425          <p>proto_template</p>    
426      </div>    
427      </div>]]>    
428     </infoblock>    
429                     
430     <customblock>    
431     </customblock>    
432                 
433    </contacts>    
434                
435    <custom_settings>    
436                     
437     <custom_style>    
438      <![CDATA[@media (min-width: 768px) {    
439          .page-header.type10 .sw-megamenu.navigation.side-megamenu {    
440              padding: 0;    
441          }    
442      }    
443      .footer-middle .block.newsletter input {    
444          background-color: #fff;    
445      }    
446      .footer-middle .block.newsletter .action.subscribe {    
447          background-color: #000;    
448      }    
449      .block-category-list {    
450          margin-bottom: 15px;    
451      }    
452      .products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {    
453          border-radius: 0 0 5px 5px;    
454          font-family: "Open Sans";    
455          letter-spacing: 0;    
456      }    
457      .price-box .price {    
458          font-family: "Open Sans";    
459          font-weight: 600;    
460      }]]>    
461     </custom_style>    
462                     
463     <custom_style_2>    
464      <![CDATA[]]>    
465     </custom_style_2>    
466                 
467    </custom_settings>    
468            
469   </porto_settings>    
470           
471   <porto_design>    
472                
473    <general>    
474                     
475     <theme_color>    
476      3B3B3B    
477     </theme_color>    
478                 
479    </general>    
480                
481    <font>    
482                     
483     <custom>    
484      0    
485     </custom>    
486                     
487     <font_size>    
488     </font_size>    
489                     
490     <font_family>    
491     </font_family>    
492                     
493     <custom_font_family>    
494     </custom_font_family>    
495                     
496     <google_font_family>    
497     </google_font_family>    
498                     
499     <char_latin_ext>    
500     </char_latin_ext>    
501                     
502     <char_subset>    
503     </char_subset>    
504                 
505    </font>    
506                
507    <colors>    
508                     
509     <custom>    
510      1    
511     </custom>    
512                     
513     <text_color>    
514     </text_color>    
515                     
516     <link_color>    
517     </link_color>    
518                     
519     <link_hover_color>    
520     </link_hover_color>    
521                     
522     <button_bg_color>    
523     </button_bg_color>    
524                     
525     <button_text_color>    
526     </button_text_color>    
527                     
528     <button_hover_bg_color>    
529     </button_hover_bg_color>    
530                     
531     <button_hover_text_color>    
532     </button_hover_text_color>    
533                     
534     <addtowishlist_color>    
535     </addtowishlist_color>    
536                     
537     <addtowishlist_hover_color>    
538     </addtowishlist_hover_color>    
539                     
540     <addtocompare_color>    
541     </addtocompare_color>    
542                     
543     <addtocompare_hover_color>    
544     </addtocompare_hover_color>    
545                     
546     <breadcrumbs_bg_color>    
547      FFFFFF    
548     </breadcrumbs_bg_color>    
549                     
550     <breadcrumbs_color>    
551      000000    
552     </breadcrumbs_color>    
553                     
554     <breadcrumbs_links_color>    
555      000000    
556     </breadcrumbs_links_color>    
557                     
558     <breadcrumbs_links_hover_color>    
559      000000    
560     </breadcrumbs_links_hover_color>    
561                     
562     <sale_bg_color>    
563     </sale_bg_color>    
564                     
565     <sale_font_color>    
566     </sale_font_color>    
567                     
568     <new_bg_color>    
569     </new_bg_color>    
570                     
571     <new_font_color>    
572     </new_font_color>    
573                 
574    </colors>    
575                
576    <header>    
577                     
578     <custom>    
579      0    
580     </custom>    
581                     
582     <header_bgcolor>    
583     </header_bgcolor>    
584                     
585     <header_bg_image>    
586     </header_bg_image>    
587                     
588     <header_bordercolor>    
589     </header_bordercolor>    
590                     
591     <header_textcolor>    
592     </header_textcolor>    
593                     
594     <header_linkcolor>    
595     </header_linkcolor>    
596                     
597     <header_top_links_bgcolor>    
598     </header_top_links_bgcolor>    
599                     
600     <header_top_links_color>    
601     </header_top_links_color>    
602                     
603     <header_menu_bgcolor>    
604     </header_menu_bgcolor>    
605                     
606     <header_menu_color>    
607     </header_menu_color>    
608                     
609     <header_menu_hover_bgcolor>    
610     </header_menu_hover_bgcolor>    
611                     
612     <header_menu_hover_color>    
613     </header_menu_hover_color>    
614                     
615     <header_menu_classicmenu_bgcolor>    
616     </header_menu_classicmenu_bgcolor>    
617                     
618     <header_menu_classicmenu_bordercolor>    
619     </header_menu_classicmenu_bordercolor>    
620                     
621     <header_menu_classicmenu_color>    
622     </header_menu_classicmenu_color>    
623                     
624     <header_menu_classicmenu_hover_bgcolor>    
625     </header_menu_classicmenu_hover_bgcolor>    
626                     
627     <header_menu_classicmenu_hover_color>    
628     </header_menu_classicmenu_hover_color>    
629                     
630     <header_search_bgcolor>    
631     </header_search_bgcolor>    
632                     
633     <header_search_text_color>    
634     </header_search_text_color>    
635                     
636     <header_search_bordercolor>    
637     </header_search_bordercolor>    
638                     
639     <header_minicart_bgcolor>    
640     </header_minicart_bgcolor>    
641                     
642     <header_minicart_color>    
643     </header_minicart_color>    
644                     
645     <header_minicart_icon_color>    
646     </header_minicart_icon_color>    
647                 
648    </header>    
649                
650    <footer>    
651                     
652     <custom>    
653      1    
654     </custom>    
655                     
656     <footer_top_bgcolor>    
657      transparent    
658     </footer_top_bgcolor>    
659                     
660     <footer_top_color>    
661     </footer_top_color>    
662                     
663     <footer_top_link_color>    
664     </footer_top_link_color>    
665                     
666     <footer_top_link_hover_color>    
667     </footer_top_link_hover_color>    
668                     
669     <footer_middle_bgcolor>    
670      D7DAE0    
671     </footer_middle_bgcolor>    
672                     
673     <footer_middle_color>    
674      828385    
675     </footer_middle_color>    
676                     
677     <footer_middle_link_color>    
678      828385    
679     </footer_middle_link_color>    
680                     
681     <footer_middle_link_hover_color>    
682      828385    
683     </footer_middle_link_hover_color>    
684                     
685     <footer_middle_title_color>    
686      000000    
687     </footer_middle_title_color>    
688                     
689     <footer_middle_links_icon_color>    
690      777777    
691     </footer_middle_links_icon_color>    
692                     
693     <footer_middle_ribbon_bgcolor>    
694     </footer_middle_ribbon_bgcolor>    
695                     
696     <footer_middle_ribbon_shadow_color>    
697      222222    
698     </footer_middle_ribbon_shadow_color>    
699                     
700     <footer_middle_ribbon_color>    
701     </footer_middle_ribbon_color>    
702                     
703     <footer_middle_2_bgcolor>    
704     </footer_middle_2_bgcolor>    
705                     
706     <footer_middle_2_color>    
707     </footer_middle_2_color>    
708                     
709     <footer_middle_2_link_color>    
710     </footer_middle_2_link_color>    
711                     
712     <footer_middle_2_link_hover_color>    
713     </footer_middle_2_link_hover_color>    
714                     
715     <footer_middle_2_title_color>    
716     </footer_middle_2_title_color>    
717                     
718     <footer_middle_2_links_icon_color>    
719     </footer_middle_2_links_icon_color>    
720                     
721     <footer_bottom_bgcolor>    
722      E1E3E8    
723     </footer_bottom_bgcolor>    
724                     
725     <footer_bottom_color>    
726     </footer_bottom_color>    
727                     
728     <footer_bottom_link_color>    
729     </footer_bottom_link_color>    
730                     
731     <footer_bottom_link_hover_color>    
732     </footer_bottom_link_hover_color>    
733                 
734    </footer>    
735                
736    <page>    
737                     
738     <custom>    
739      1    
740     </custom>    
741                     
742     <page_bgcolor>    
743      E1E3E8    
744     </page_bgcolor>    
745                     
746     <page_bg_image>    
747     </page_bg_image>    
748                     
749     <page_custom_style>    
750      <![CDATA[]]>    
751     </page_custom_style>    
752                 
753    </page>    
754                
755    <main>    
756                     
757     <custom>    
758      0    
759     </custom>    
760                     
761     <main_bgcolor>    
762     </main_bgcolor>    
763                     
764     <main_bg_image>    
765     </main_bg_image>    
766                     
767     <main_custom_style>    
768      <![CDATA[]]>    
769     </main_custom_style>    
770                 
771    </main>    
772            
773   </porto_design>    
774           
775   <mpsearch>    
776                
777    <general>    
778                     
779     <enabled>    
780      0    
781     </enabled>    
782                 
783    </general>    
784            
785   </mpsearch>    
786  </config>    
787 </root>